Skip to content

ci: add main-branch DRA check for minor version-bump workflow - #19381

Open
ninalee12 wants to merge 1 commit into
elastic:mainfrom
ninalee12:add-main-branch-dra-check
Open

ci: add main-branch DRA check for minor version-bump workflow#19381
ninalee12 wants to merge 1 commit into
elastic:mainfrom
ninalee12:add-main-branch-dra-check

Conversation

@ninalee12

Copy link
Copy Markdown
Contributor

Description

During the recent minor version bump (9.5), each team's version-bump pipeline advanced main to the next dev minor (9.6.0-SNAPSHOT) in addition to cutting the release branch. The version-bump pipelines currently verify only that the release-branch DRA artifacts landed (staging + snapshot for ${BRANCH}.json) — they do not verify that main's DRA snapshot actually published at the new version.

This means a minor bump can report success even if main's DRA pipeline never picked up 9.6.0-SNAPSHOT. The gap was identified during the 9.5 feature freeze. Only ml-cpp and kibana had a main-branch check; this brings the remaining repos up to the same standard.

Tracking: elastic/platform-engineering-productivity#3012

What

Adds a two-step sequence, gated on WORKFLOW=minor:

  1. generate-master-dra-check — runs after fetch-dra-artifacts. Computes the next dev minor from NEW_VERSION (e.g. 9.5.09.6.0) and dynamically uploads a child step via buildkite-agent pipeline upload.
  2. fetch-master-dra-artifacts (uploaded at runtime) — polls master.json on GCS with elastic/json-watcher until .version equals ${next_minor}-SNAPSHOT.

Patch and major bumps are unaffected — the if: build.env("WORKFLOW") == "minor" guard means neither step is uploaded.

Notes

  • The GCS alias for main's DRA artifacts is master.json (not main.json).
  • The next minor is derived from NEW_VERSION, not BRANCH.

Adds a generate-master-dra-check step (minor workflow only) that
computes the next minor version and dynamically uploads a
fetch-master-dra-artifacts step to poll master.json for
{major}.{minor+1}.0-SNAPSHOT, confirming the main branch DRA
build has picked up the new version.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@github-actions

github-actions Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)
  • run exhaustive tests : Run the exhaustive tests Buildkite pipeline.

@mergify

mergify Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

This pull request does not have a backport label. Could you fix it @ninalee12? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
  • If no backport is necessary, please add the backport-skip label

@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

💛 Build succeeded, but was flaky

Failed CI Steps

@ninalee12
ninalee12 marked this pull request as ready for review August 6, 2026 17:21

@v1v v1v left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I mentioned at elastic/beats#52435 (review)

let's move the logic to a BK plugin, why? because BK plugins can simplify the usage, support tests and avoid inline scripts to create dynamic pipeline steps that cannot be tested easily.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants